From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
Date: Thu, 24 Sep 2020 15:41:27 +0000 (-0300)
Subject: appDisplay: Only change excluded-apps when not deleting folder
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~655^2^2~8
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=31591ff0293dbdef7808ac6188599dde63ba1f37;p=gnome-shell.git

appDisplay: Only change excluded-apps when not deleting folder

It is useless to update the 'excluded-apps' list when we know we're going
to delete the folder entirely.

Only update 'excluded-apps' when not deleting the app folder.

https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1447
---

diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index ed735f540..66a4557bb 100644
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -1806,15 +1806,6 @@ class FolderView extends BaseAppView {
         if (index >= 0)
             folderApps.splice(index, 1);
 
-        // If this is a categories-based folder, also add it to
-        // the list of excluded apps
-        let categories = this._folder.get_strv('categories');
-        if (categories.length > 0) {
-            let excludedApps = this._folder.get_strv('excluded-apps');
-            excludedApps.push(app.id);
-            this._folder.set_strv('excluded-apps', excludedApps);
-        }
-
         // Remove the folder if this is the last app icon; otherwise,
         // just remove the icon
         if (folderApps.length == 0) {
@@ -1828,6 +1819,15 @@ class FolderView extends BaseAppView {
             folders.splice(folders.indexOf(this._id), 1);
             settings.set_strv('folder-children', folders);
         } else {
+            // If this is a categories-based folder, also add it to
+            // the list of excluded apps
+            const categories = this._folder.get_strv('categories');
+            if (categories.length > 0) {
+                const excludedApps = this._folder.get_strv('excluded-apps');
+                excludedApps.push(app.id);
+                this._folder.set_strv('excluded-apps', excludedApps);
+            }
+
             this._folder.set_strv('apps', folderApps);
         }
     }